Connect the destroy signal in the example instead of the ui file. Also set

    * demos/gtk-demo/builder.c (do_builder): Connect the
    destroy signal in the example instead of the ui file.
    Also set the screen and title of the window.
    (#451345, Thomas Rydzynski)

svn path=/trunk/; revision=18251

diff --git a/ChangeLog b/ChangeLog
index a379891d8e12ac232d3efd92e514ad7ae43d58b7..f6465ac67325f38936de2587112c5a58e237c432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-26  Johan Dahlin  <jdahlin@async.com.br>
+
+       * demos/gtk-demo/builder.c (do_builder): Connect the
+       destroy signal in the example instead of the ui file.
+       Also set the screen and title of the window.
+       (#451345, Thomas Rydzynski)
+
 2007-06-26  Richard Hult  <richard@imendio.com>
 
        * gtk/gtkbuilder.c: (gtk_builder_value_from_string_type): Fix a

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index 33639699454551aedc17c6d1ac2896e94d5550ba..1b0b8471e558bbcc0330515f0e19202a70d3b343 100644 (file)
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -43,6 +43,10 @@ do_builder (GtkWidget *do_widget)
        }
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                            gtk_widget_get_screen (do_widget));
+      g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index 9830ed96c8d6ff069b05d25ffe657f70a67bbac8..b6d22bb811b15b9d7be4dc843905047dc62bfbc5 100644 (file)
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -141,7 +141,7 @@
     <object class="GtkWindow" id="window1">
         <property name="default_height">250</property>
         <property name="default_width">440</property>
-        <signal name="destroy" handler="gtk_widget_destroyed"/>
+        <property name="title">builder</property>
         <child>
             <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>